merge trunk
authorKenichi Handa <handa@gnu.org>
Sun, 16 Sep 2012 16:18:23 +0000 (01:18 +0900)
committerKenichi Handa <handa@gnu.org>
Sun, 16 Sep 2012 16:18:23 +0000 (01:18 +0900)
commit308e16482e3fdb889d8cd1ae863c2436b4d7ba50
treedc9e5e5cea2f0484df4aa1beb6bf2a2e96fef320
parent353107c66fdd2dcc7a07a5545ced1160d7047548
parent7818e6a3a5f704541400f325502f0b64f863d729
merge trunk